added post-merge git tool