fix conflicts
bump to 2.4.0