Cleaned up medic form
Resolved conflicts before merge