Talks in Geneva aimed at ending the Syrian conflict appear to be back on track after more violence on the ground threatened to derail them.