Conflict resolution
Added test form back to commits