removing block_party folder, trying to resolve conflict