Changes for conflict
changes to avoid conflict