Scalaxy/Privacy: fix skipping of abstract / deferred members
fix merge