fix. now merge is ok