This was a conflict so normally the version you're looking for is in the Conflict folder.