Yogesh || Fix unable to edit submission
Yogesh || Submission conflict save implementation & ui fixes