Dequeue changes immediately on merge conflicts

Change-Id: I4a2b9c5bc3a5659e874fe2bccbbd61da01713b9a