Manual Merge - P. gsm, state machine, working res list, options