Fixed merg issues and maybe some differences where clanpp is more lenient