New application wrapper proposal
Merge local changes with conflicts in the remote repo