fixed unremoved traces of conflicted code