Fixed imports and merge artifact