FIRST COMMIT:   Empty NightWatch
Resolved xcuserstate conflict