I have a merge conflict in the files. So i have to remove everything which is above the master from both local and remote.Please see the image. how do I do it. I am not sure