resolving changes between my two folders