delete end in file route and front form flat
add front to form flat
improve form edit and new flat
index flat conflict fixed
fixing conflicts
Revolving conflicts in the flats#index
Merge branch 'add-front-to-form'
Merge conflict