added new view
fixed conflict