Fix merge conflict in sql docs