Cleared out the conflicts from 1.2.2;