resolve a problem after merging branch