Peter Makarona back in Merrivale's yellow and black after three-year absence