Added a pause if conflict resolution was too fast