[aerogear-dev] Conflicts & Reconciliation