cleaned up git diffs