Fix some issues from the merge conflict