hopefully merge issues fixed