merge conflicts
merge conflicts and logged_in users page