changed indentation
fixed conflicts