Projects >> congress-android >>a983c16850da3c358e4b7104954432b929c70895

Chunk
Conflicting content 
		if (loadLegislatorsTask == null)
			loadLegislators();
<<<<<<< HEAD
		else
			loadLegislatorsTask.onScreenLoad(this);
=======
		else {
			if (loadLegislatorsTask != null)
				loadLegislatorsTask.onScreenLoad(this);
		}
>>>>>>> 8800279af223aa911e49c46b0eba9a874fe705d3

		if(addressUpdater != null)
			addressUpdater.onScreenLoad(this);
Solution content 
		if (loadLegislatorsTask == null)
			loadLegislators();
		else
			loadLegislatorsTask.onScreenLoad(this);

		if(addressUpdater != null)
			addressUpdater.onScreenLoad(this);
File
LegislatorList.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation