resolve conflict in copyright message
again skeleton code