changes to remove conflicts