merge into compass plugin