styling compass
resolved project merge conflict