Added some previous work
conflict removed