merge break fix