File after resolving conflict