Fixed the merge problems + started on main menu