Cleaned
Merge and fixed conflicts.