add columns to projects
fix merge conflicts