Finish merge & improve clearance modal