done
resolving merge
removes redefinitions