Merge application with master