before view
Conflit fix