Fixing the form pattern
Resolve conflicts.