8415f13bab
* removed throw and else on container action handler * repaired merge resolution error
* removed throw and else on container action handler * repaired merge resolution error