part 2 of fixing merge conflict