added *
fixed conflict
refined line