moved forms to view templates
save
resolve merge