fix conflicts
fix broken test