symfony project
fixed conflicts