Fixed bug
resolve merge conflict