#3863: fixed
resolved conflicts