remove conflict markers and old code