cleared unresolved conflict artifacts