schedule fix
gitignore
merge