forgot a flag when merging