fix dodgy merge
ignore some files