"Resolved conflicts in previous commit/emerges"