removed stray conflict marker