removed a merge thing