Fix rivets binder conflict