Resolved auto-merge artifacts