merge with hash changes
chekek