Resolve merge-conflict.