Fixed empty ticket form problem
fixed conflicts