merge whoopsy fix