Nested levels

Hi,

I tried to fix some "nested levels" PHPCS errors.
I didn't change too much files at the same time to keep the corrections readable.

Does anyone know why this pull request has the status: "Error checking merge status" ?

Thanks,
Hugues.