Init guestbook
Commit home
edit conflict
Merge