diff --git a/src/main/java/de/thm/arsnova/entities/LoggedIn.java b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
index d37decdb4d2ae44dd2dafbfa36cd0a390bc02a90..b6613a9a2fb83cc4843b6655346facaeec3aaee9 100644
--- a/src/main/java/de/thm/arsnova/entities/LoggedIn.java
+++ b/src/main/java/de/thm/arsnova/entities/LoggedIn.java
@@ -31,6 +31,7 @@ public class LoggedIn {
 	private String sessionId;
 	private long timestamp;
 	private List<VisitedSession> visitedSessions = new ArrayList<VisitedSession>();
+	private List<String> _conflicts;
 
 	public LoggedIn() {
 		this.type = "logged_in";
@@ -111,6 +112,18 @@ public class LoggedIn {
 	public void setVisitedSessions(List<VisitedSession> visitedSessions) {
 		this.visitedSessions = visitedSessions;
 	}
+	
+	public List<String> get_conflicts() {
+		return _conflicts;
+	}
+	
+	public void set_conflicts(List<String> _conflicts) {
+		this._conflicts = _conflicts;
+	}
+	
+	public boolean hasConflicts() {
+		return ! (_conflicts == null && _conflicts.isEmpty());
+	}
 
 	@Override
 	public String toString() {