before pulling
fixed conflicts
cambios de front end