updated git
pre merge
post commit