don't merge until load bug is fixed