erged conflicts 5/5