fix: merge conflicts

Signed-off-by: Luka Trovic <luka@nextcloud.com>

lib/Db/AttachmentMapper.php

@@ -156,4 +156,14 @@ class AttachmentMapper extends DeckMapper implements IPermissionMapper {
 		}
 		return $this->cardMapper->findBoardId($attachment->getCardId());
 	}
+
+	public function mapOwner(Attachment &$attachment) {
+		$attachment->resolveRelation('createdBy', function ($userId) {
+			$user = $this->userManager->get($userId);
+			if ($user !== null) {
+				return new User($user);
+			}
+			return $user;
+		});
+	}
 }