Made my bad changes

Should produce plenty of conflicts.
Merge branch 'chris_conflict_creation'