undo .gitignore patch and fix build