Added spring form tags
Resolved conflicts