made container a class
merge