removed old conflict marker