added solution
resolve merge conflict