Fixing garbage put in by merge