excellent feedback is excellent. fix bad merge