APOLLO-3342 Fixed merge artifact