Get the correct file, merge failed