Removed useless layout
Sole conflict