Distinguish between branch --meila
update conflict