Afalsario

fixed conflicts