compression fixed
version conflict fix