Fix merge conflict
Fix/suppress last warnings
Fix PHP-CS notices