Merging problems

HAd some problems with Git, hopefully this fixes it.