revised big merge