resolving issues introduced while fixing a conflict