merge aj change