Fix of Master branch
resolve merge conflict