Resolves merge conflict.