jobs form changes
resolved conflicts
resolved conflicts