still had conflict - need workaround.