more merge conflicts in user show