fix setskinApp
fix merge