Attempt to fix conflicts