Remote was updated on another device since your last pull. Review the diff and choose how to proceed.