Prevent delegation of columns which are both in master and version