Front end dev challenge step view
Fix merge