fixes merge conflict on board scss