Add post-merge script and some git setting