had left git conflict message in there. deleted that.