Fixed up indenting from Xcode
Fixed conflicts