removed join table, put it on branch