Added some files
Solving conflict