recreate feature without syslog advanced
resolve merge conflict