merged conflicts
changed various views, added timestamps