Please remove the "HEAD" markers indicating conflicts.