corrected copyright statement
merged conflict