I wouldn't merge this until the main logfile is removed. Much easier to get rid of the extra file right now than leave it for later and bloat the repo.