Resolved conflict

2 jobs for features/editable-semester-process in 56 minutes and 51 seconds (queued for 9 seconds)