diff --git a/merge_panel.go b/merge_panel.go
index 7b595b393..e7681993c 100644
--- a/merge_panel.go
+++ b/merge_panel.go
@@ -18,7 +18,7 @@ func findConflicts(content string) ([]conflict, error) {
 	conflicts := make([]conflict, 0)
 	var newConflict conflict
 	for i, line := range splitLines(content) {
-		if line == "<<<<<<< HEAD" {
+		if line == "<<<<<<< HEAD" || line == "<<<<<<< Updated upstream" {
 			newConflict = conflict{start: i}
 		} else if line == "=======" {
 			newConflict.middle = i