Missing hints when changing a column's structure
Fix merge conflicts