fix issues from merge