Initial Commit
Fixed conflicts