solves conflict