small merge fixes