Cleaning
Delete conflicts
.gitignore modified