(demo) fix conflct