floating definitions re-fixed, other merge conflict fixed.