fixed issues from merge