Symfony start
Fixed merge