merge for conflict