Resolve conflict bug