before pulling
after conflicts fix
works a little better on arrays of composites..