Some changes to create conflict