Fix merge issues in removeJob merge