A WTF conflict has been resolved