Solves any conflict