add patient table
fixed conflict