commit issue7
fixed conflict
fixed issue6