started to add copyright
fixed marger conflicts