checked gitignore
resolved conflicts
ready to push live