Re: [aerogear-dev] Conflicts & Reconciliation