version problems merge ok