fixing view
fixed conflict