Merged, fixed conflicts.