Remove conflict marker and compile last version