solving conflicts
first demo