test conflict

added a comment in inventory to test conflicts.