resolve the svn and git conflicts by manuall remove 3 files