'git conflicts' - tells me conflicting files