fixed git/merge artifact
fixed git/merge artifact