mannual merge