Ignoring files.
Delete conflict file.