worked on submitting tickets
fixed conflicts