final merge issues fixed