Resolve conflict

changes defaultcontroller.php and view.php
sets up a conflict view. this will show how the 2 different revisions are different, and inform the user.