git lied to me!! found a spot where there was another conflict