updated CHANGELOG for v.2.2.1
conflict fixed