Add a warning about merges and suggest cherrypicking