Fixed another merge error, added missing copyright notice