removed <<<<<HEAD, >>>>, etc from conflicts