added comments
fixed conflicts