add return value for operator==, fixed merge problems