update merge for last 1.0 code