add resource column migration
separated fat and weight measurement logging
separate fat and weight logging
fix merge conflicts