Add merge_file_master for master