resolved sql script merge errors