Resolved bug for long waiting time
Conflict changes