killed some accidentally remerged text