chinese/font-std: resolve conflict
japanese/gqmpeg: resolve conflict
Success: audio/gqmpeg v0.20.0_10,1