c
modifide confrict
Finish layout and routes