resolving last conflict on users show