Recompile app
Resolve merge conflict