Adds one line to bs_n_ovrrides
Merge branches 'master' and 'dev'