resolving merge conflict with StartNotify