removed merge information that was causing compilation errors