Fixed the unmerge conflict files to the master