I'm completely lost now.

Please tidy up after the merge.