remove random words caused by merged conflict