Fixed conflicts and issues from merge