merge cont'd