optionally merge issue2 and 16