new feature fixed #172: deal with merge confiliction