separated changes from new features and added information about rescheduling upon auction failure
Resolved conflict, since we both said same statement in different branches