Colin Farrell and former lover, Playmate beauty Nicol Narain, have made up over their disagreement about the release of a sexy tape.