fix git conflict artifact