Updated pre commit and post merge