tidied everything up
conflict
changes