clean app
fix merger