Fix: Issue when merging beta5