[galaxy-dev] [hg] galaxy 1666: Attempting to merge conflicts.