Merge issues fixed