Resolves merge conflicts