merge my changes while I'm mobile