fix code
fixed merge
filter code