join fix
entity merge