[ilvez]

Lived like this years, never going to look back. Add mobile to the mix and you're screwed with conflicts and manual resolution.