stable release
fix conflicts