Cannot Merge Because Of Unmerged Files