Attempting new merge
Untracking setup sql