Fix too many conflict