work done on the ben and lida exchanges

title
fixes merge conflict

title