conflict
Merge branch 'master' of github.com:syafik/booktalk
Merge branch 'master' of github.com:syafik/booktalk
Merge branch 'master' of github.com:syafik/booktalk
Merge branch 'master' of github.com:syafik/booktalk
Merge branch 'master' of github.com:syafik/booktalk
update
Merge branch 'master' of github.com:syafik/booktalk
update
 fixed conflict