now it is ok... did some mess inmerging