Resolve conflicts in wekaInstances.java class