cleaned up merged files and got rid of compilation errors (for now...)