Resolving merge conflicts in the debugger branch