jackie - resolve conflict