minor change in ^M
resolve conflict