Fix issues from merge