Manual merge of current in-progress bobby work