Fixed merge issues
Really Merged Now