Fixed MergeTest