Pull changes and resolve merge conflict.