App: clean merge