spacing issues
merged conflicts, brought in new copy