modification
resolve conflict on variable