* Merge and commit separately,
to get newline between commit content and Change-Id
* Install prepare-commit-msg git hook, for nicer conflict messages
https://gist.github.com/mikeNG/e55ef8e7a1e5cd596a950386503054fd/
Change-Id: I97370b352ccf4f146b4b6ea89af75e032fb13730