fixes fallout duplication from merge conflict