cleanup and readd of missing merge stuff