trying to resolve conflict 2