Fixed everything back to 1600x1200
Merge