Google guys
Fixed merge issues