Feature two (fixed)

fixed feature two can we merge?