Sysmerge (attempt 2)

Maybe better this time?