Finish a feature
merge test 1