resolved conflicts in users, and cleaned up leftover line in changesets.