fixed unseen merge code from last merge conflict