diff --git a/src/main/java/de/thm/arsnova/entities/Session.java b/src/main/java/de/thm/arsnova/entities/Session.java
index cc3b66a7295d680e138a3896c69f1f5aa6693311..0e17a2df5bb68032853d86cc71bb4e332ea579d3 100644
--- a/src/main/java/de/thm/arsnova/entities/Session.java
+++ b/src/main/java/de/thm/arsnova/entities/Session.java
@@ -19,6 +19,7 @@
 package de.thm.arsnova.entities;
 
 import java.io.Serializable;
+import java.util.List;
 
 public class Session implements Serializable {
 
@@ -33,6 +34,7 @@ public class Session implements Serializable {
 	private long lastOwnerActivity;
 	private String courseType;
 	private String courseId;
+	private List<String> _conflicts;
 
 	private String _id;
 	private String _rev;
@@ -108,6 +110,14 @@ public class Session implements Serializable {
 	public String get_rev() {
 		return _rev;
 	}
+	
+	public void set_conflicts(List<String> conflicts) {
+		_conflicts = conflicts;
+	}
+
+	public List<String> get_conflicts() {
+		return _conflicts;
+	}
 
 	public boolean isCreator(User user) {
 		return user.getUsername().equals(this.creator);