Fix `make clean` by removing rebase markers#1474

reshke merged 1 commit intoapache:cbdb-postgres-mergeapache/cloudberry:cbdb-postgres-mergefrom

reshke:fix_make_cleanreshke/cloudberrydb:fix_make_cleanCopy head branch name to clipboard