Fixing all the conflicts