|  | @@ -21,17 +21,17 @@ public class BottomTabsOptions implements DEFAULT_VALUES {
 | 
	
		
			
			| 21 | 21 |  	public int tabBadge = NO_INT_VALUE;
 | 
	
		
			
			| 22 | 22 |  	public NavigationOptions.BooleanOptions hidden = NavigationOptions.BooleanOptions.False;
 | 
	
		
			
			| 23 | 23 |  	public NavigationOptions.BooleanOptions animateHide = NavigationOptions.BooleanOptions.False;
 | 
	
		
			
			| 24 |  | -	public int currentTabIndex;
 | 
	
		
			
			| 25 |  | -	public String currentTabId;
 | 
	
		
			
			|  | 24 | +	public int currentTabIndex = NO_INT_VALUE;
 | 
	
		
			
			|  | 25 | +	public String currentTabId = NO_VALUE;
 | 
	
		
			
			| 26 | 26 |  
 | 
	
		
			
			| 27 | 27 |  	void mergeWith(final BottomTabsOptions other) {
 | 
	
		
			
			| 28 | 28 |  		if (!NO_VALUE.equals(other.currentTabId)) {
 | 
	
		
			
			| 29 | 29 |  			currentTabId = other.currentTabId;
 | 
	
		
			
			| 30 | 30 |  		}
 | 
	
		
			
			| 31 |  | -		if(NO_INT_VALUE != other.currentTabIndex) {
 | 
	
		
			
			|  | 31 | +		if (NO_INT_VALUE != other.currentTabIndex) {
 | 
	
		
			
			| 32 | 32 |  			currentTabId = other.currentTabId;
 | 
	
		
			
			| 33 | 33 |  		}
 | 
	
		
			
			| 34 |  | -		if(NO_INT_VALUE != other.tabBadge) {
 | 
	
		
			
			|  | 34 | +		if (NO_INT_VALUE != other.tabBadge) {
 | 
	
		
			
			| 35 | 35 |  			tabBadge = other.tabBadge;
 | 
	
		
			
			| 36 | 36 |  		}
 | 
	
		
			
			| 37 | 37 |  		if (other.hidden != NavigationOptions.BooleanOptions.NoValue) {
 |