resolving MR conflict

4 jobs for mrchrisw/customer-calls in 4 minutes and 47 seconds (queued for 2 seconds)