removed commit conflict text