removed compass dependencies
fixed merge conflicts