Added post-merge git hook