resynced with new gitignore