fixx merge bug