Fixing project merge