fixed git/merge artifact