thu afternoon nate
resolved tv.coffee conflict