added comments
added comments
fixed conflicts