Improved handing with custom conflicts