Fixed merge errors in Join