Deploy stable after merge conflict fix