cleared-up diffs with remote