Fix issues from merge conflict