implemented diff of 5
Merge branch 'union' of https://github.com/rigeljs/aligner into union