Remove superfluous supers
Fix merge conflicts