check for/resolve differences in files
check for/resolve differences in files