just testing for conflict
resolved conflicts at line 1