This file don't need to be merged, this is just a copy automatically added when you have to resolve conflicts, please remove this. I'm afraid you're going to double check your resolved conflicts.