Fixing merge when there are conflicting variables in the source and the destination + minor test moving.