I think to not have this glitch you have to recruit him when you retake branch before going to ivalice. After beating Hans you go outside and to the left is a portal. Beat the dungeon and you get him the first time which I assume unglitches him in merged world. I assume this can be done at any time before merged world or wherever he was forced into your party