changes to resolve conflict