test commi
fixed conflicts to routes and views