Resolve conflict 2