trying to resolve conflict take 2