remove git conflict marker