How to fix conflicts when updating