Removed unused frog image outline on client side
Fixed merge conflict