Fixed the merge

Getting start of starting again.