Merge conflict for actions