Make a conflict,Add  a log, Add a package and a class

some change