reconcile dev and master