fixed other merge conflicts