When it's been a while, and you're out of sync with your team's tools and tactics, merge conflicts can get real tricky.