add conflict for myvariables and approvedrevs (#3819)
reported in T7104, upstream https://phabricator.wikimedia.org/T279617