Fixed merge issues
works