fixed a typo in *.changes
updated version conflict