making sure things work after combining my two old repos