commite prior to merge
fixed conflict