resolved conflict with input/label
fixed conflicts