removed some old conflict mark