Resolve merge conflict

This commit fixes merge conflict which happened in latest commit.