resolve merge conflict
problem with vi editor fixed