4/27 fixed all merge issues!