Adding hidden info that will generate a merge conflict