Added action merging to content merging