Stupid Conflict Thing

It added stuff… Removing that stuff...