merge experience and leveling changes
clean up merge conflicts