Add info to docs regarding merging local changes