nearly finished
resolve merge conflict