Jerusalem's Church of the Holy Sepulchre reopens after spat