fixed bug
resolve merge conflict