commit merge code error