fixed conflict resolver screw-up, also fixed waring in player