Jackie - fix conflict