Merge two Archives

i have put the a ninox file into dropbox to sync my two computers, laptop and stationary. i did some extensive changes on both of the computers before realising, that i am not working in the same database. is there anyway i can merge the two or see the differences otherwise without comparing one db to the other? would be greatful for any help...