"fixed merge issue"