git stash didn't work
resolved conflicts
changed color presentation on index page, going to see if latest update time is working properly