What happens when a merge conflict occurs in git? (Choose two correct answers.)
A . The conflicting files remain unchanged in the local repository.
B . Conflict markers are added to the files.
C . A new branch containing the remote changes is created.
D . The affected files are flagged as conflicting.
E . The newest version is placed in the local repository.
Answer: D,E