Fix merge and schema