[wallace] fixing an assertion to actually assert
[wallace] gitignore"
fixing my git
[wallace] merge conflict resolution