fixed merge for realz