Merge Diff Markers in FileCatalogDB.sql

Remove merge diff markers