server now checks last hour as well
fixing merge conflict