[galaxy-dev] symlink to june_2007_style

When merging in the latest galaxy-central, I'm getting this error: merging lib/galaxy/webapps/galaxy/controllers/library_common.py merging lib/galaxy/webapps/galaxy/controllers/page.py merging lib/galaxy/webapps/galaxy/controllers/user.py merging run.sh merging scripts/manage_db.py abort: could not symlink to 'style': File exists: /Users/robertbaertsch/src/medbook-merge/medbook-galaxy-central/static/june_2007_style Should I do the following: $ mv june_2007_style style $ ln -s style june_2007_style and then $ hg merge