reconcile main tree with open-source eclair