and now it says there is no conflict again, so I'm gonna try deleting that ONE GODDAMN FILE THAT'S BEEN SENDING ME IN CIRCLES FOR FUCKING HOURS