1.5 2nd direct
conflicts fixed