Fix merge system