Merge local changes with BootStrap and default csv definition from Git