Update update-fork.sh

Add no edit flag when merging