fixing a merge conflict issue