Finish fixing merge conflict