Updated about page
Reversed mergetool error