setup inline editting
resolve mergeconflicts with inlineeditting