Removing stuff that created conflicts