Aquaman and Black Manta make peace