How to fix conflicts in vortex