sh is making changes.
conflicts are solved.