diff --git a/usr/bin/bsdlfeeds.py b/usr/bin/bsdlfeeds.py
index 3792abc..ee4071b 100755
--- a/usr/bin/bsdlfeeds.py
+++ b/usr/bin/bsdlfeeds.py
@@ -59,11 +59,7 @@ def main():
     args = parser.parse_args()
 
     client = connect()
-<<<<<<< HEAD
     profile = get_feeds(client, args.handle, args.folder, cursor=cursor)
-=======
-    profile = get_feeds(client, args.handle, args.folder)
->>>>>>> 01ee0aacb9e93bd6572ab9049f26878733f8bf85
 
 
 
diff --git a/usr/home/.bash_aliases b/usr/home/.bash_aliases
index 9a99690..d5b9f81 100755
--- a/usr/home/.bash_aliases
+++ b/usr/home/.bash_aliases
@@ -27,14 +27,13 @@ alias git_light="git filter-repo --strip-blobs-bigger-than 10M"
 alias s="sudo -E"
 
 function src() {
+	source $HOME/.bashrc || true
 	d="$PWD"; while [ "$d" != "/" ]; do
-		for a in "$d/bin/activate" "$d/.*/bin/activate"; do
-			#echo "looking bin/activate in $d"
-			[ -f $a ] && source "$a" && break 2
+		for a in "$d/bin/activate" "$d/.env/bin/activate"; do
+			[ -f $a ] && echo "found at $a" && . "$a" && break 2
 		done
 		d=$(dirname "$d")
 	done
-	source $HOME/.bashrc || true
 }