Update to fix conflicts