Yea, it works. This is just when there was a merge conflict, i just git mergetool and chose that I want the remote's file, but idk why they saved a original file under that name. I did git rm that file and then pushed again but it says everything up to date. Any idea what should i do?