Added comment
fixed conflicts