the latest version, near the end of the beginning
resolved minor conflict