fixing dom issues from merge