merging still (compilation errors)