finish fixing merge conflict