Resolving merge for sidebar