(Debug) Fix rebase conflicts