fixed merge ignore