Removed restart after merge, best put in a post-merge hook