Looks like we had a conflict

Check and make sure it all worked out okay