diff --git a/ts/Manager/RoomRow.tsx b/ts/Manager/RoomRow.tsx
index 5903646..721a7f4 100644
--- a/ts/Manager/RoomRow.tsx
+++ b/ts/Manager/RoomRow.tsx
@@ -194,11 +194,15 @@ const RoomRow: React.FC<Props> = (props) => {
 		return <span></span>;
 	}
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 	function edit(field: string, type: 'text' | 'number' = 'text', canEdit = true, options?) {
 =======
 	function edit(field: string, type: 'text' | 'number' = 'text', canEdit: boolean = true, options?) {
 >>>>>>> 63daf83 (feat: manage view of rooms for moderators and users)
+=======
+	function edit(field: string, type: 'text' | 'number' = 'text', canEdit = true, options?) {
+>>>>>>> 82951e9 (feat: sharing rooms with moderators and users)
 		return canEdit ?
 			<EditableValue field={field} value={room[field]} setValue={updateRoom} type={type} options={options} />
 			: