just two lines for conflict