Is make used to mean the same thing in the next two sentences?

Make merry.

They made nice together, as if their fight never happened.
the same meaning