Resolve initial merge conflicts