Resolve conflicted files after merge