Fix hasil merge