things are working, time to merge and continue with the watcher