[MRG] Merge completion