working on product units controller
resolving conflict