some redundant changes because we thought we were working on the active branch