created and worked on new files. These are almost the only files we need.
merge conflict in login.php fixed
merge conflict in official.php fixed
merge conflict in user.php fixed
all merge conflicts fixed