Fixing comflicts

Two titlepaged appared, removed one and updated titlepage