changed how times are rendered in rails
fixed merge conflict