Merging Levi's .gitmodule