add fehbg to gitignore
fix merge conflict