Vinay | #2170 | Voided visits in between causes issues in merging