create food and exercise page, and added timepicker
merge error