fixed some things changed in merge conflicts