Remove tracking for #* files. fixed merge commit with color theme.