merge with the latest master and fix conflicts
merge