Alignment now works with merging; few more options needed.