question render ajaxify with timer
merging conflicted files