Fixed issue128 merge bug