fixed conflicts in spreadapp