fixed
fixed merge
added hw