Initial Files & commit
Fixed conflicts