adds user profiles
removes merge conflicts