mannually merged