Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)