The past tense of kiss and make up is kissed and made up.
The third-person singular simple present indicative form of kiss and make up is kisses and makes up.
The present participle of kiss and make up is kissing and making up.
The past participle of kiss and make up is kissed and made up.