removed some autogenerated git conflict code