Add spotlight directory to hgignore and update merge behaviour.