spent 2 hours resolving merge conflicts only to realize i was on the wrong branch the whole time 🤦‍♂️