Fixing unstable merging