No more out of bounds errors
Fixed merge conflicts