Projects >> vraptor-dash >>8946158eaa6038aa701c3f851f449d192e6c40a9

Chunk
Conflicting content 
		session.merge(statement);
	}

<<<<<<< HEAD
	public Statement load(String idStatement) {
		return (Statement) session.load( Statement.class, idStatement);
=======
	public Statement load(String id) {
		return (Statement) session.load(Statement.class, id);
>>>>>>> c2de55fe9e223ff4fa4c04a986d7f3addc7496f4
	}

	@SuppressWarnings("unchecked")
Solution content 
		session.merge(statement);
	}

	public Statement load(String id) {
		return (Statement) session.load(Statement.class, id);
	}

	@SuppressWarnings("unchecked")
File
StatementDao.java
Developer's decision
Version 2
Kind of conflict
Cast expression
Method signature
Return statement