Merged files and fixed compilation errors.