applied css changes to .less and recompiled
resolving conflicts