Improving General Text Embedding Model: Tackling Task Conflict and Data Imbalance through Model Merging