fixed conflicts
fixed topics
d