Fixed according to PSR rules
Fixed conflicts

Signed-off-by: Julien Bonvarlet <jbonva@gmail.com>