manually merge of setup sql because of conflict