Resolve minor conflict