compass working
fixed merge conflict