solved conflict filter file