v0.7.7
fix conflicts