merge remote from local git (reverted from commit ceb1ffd9d8931828426f46ad345b988951d7be6e)