change master_file by local
resolve conflict in master_file