Fixing merge, buildable project