corrected rashaad's merge