Warring factions of J Jayalalithaa's AIADMK finally made up on Monday and agreed to merge two factions, which emerged after the former chief minister's demise last year.