Fix: Merge was not valid