bug 1123: fixed merge conflicts