updated serval plugin schema register calls
include path merge conflict