Merge local development branch