mannual merge issues corrected