Fix artifact coming from rebase and merge fails.
Fix artifact coming from rebase and merge fails.

ds283/splinter,ds283/splinter,bgrimstad/splinter,bgrimstad/splinter,bgrimstad/splinter,bgrimstad/splinter,ds283/splinter,bgrimstad/splinter,ds283/splinter,ds283/splinter