Yemen to merge resistance fighters with army