Added admin check in controller merge action