Fixed errors so it compiles
Fixed merge