fixed merging errors
-rw-r--r-- 12616 GITManagedWebpage.class.php