fixed nehas stupid bug
fixed merge