Changed functionality of merge, better change assertion too.