removing conflicting assets