fix restaurant add forms
resolve conflict