Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)

	both modified:   .gitignore  // I want to merge changes with origin
	deleted by us:   html/index.php // i want to keep index.php on origin