release 1.6.1
update list of known conflicts
version bump 1.6.1