merge: force manual mode