web interface
resolve merge conflict