fixed incorrect merge remarks