Fix: Merge errors removed