fix conflicts on repo (unnecessary switching between branches)