No conflict? Edit in another place than gitit