diff --git a/02_activities/assignments/assignment.sh b/02_activities/assignments/assignment.sh
index 8c138092b..c6841deea 100644
--- a/02_activities/assignments/assignment.sh
+++ b/02_activities/assignments/assignment.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
 set -x
 
 ############################################
@@ -29,40 +30,26 @@ unzip -q rawdata.zip
 
 # 1. Create a directory named data
 mkdir data
-
 # 2. Move the ./rawdata directory to ./data/raw
-
-
-mv rawdata/* data/raw/
-
-
+mv rawdata data/raw
 # 3. List the contents of the ./data/raw directory
 ls data/raw
-
 # 4. In ./data/processed, create the following directories: server_logs, user_logs, and event_logs
-
-mkdir -p data/processed/{server_logs,user_logs,event_logs}
-
+cd data
+mkdir -p processed/server_logs processed/user_logs processed/event_logs
 # 5. Copy all server log files (files with "server" in the name AND a .log extension) from ./data/raw to ./data/processed/server_logs
-
-cp data/raw/*server*.log data/processed/server_logs/
-
+cp raw/*server*.log processed/server_logs/
 # 6. Repeat the above step for user logs and event logs
-
-
-cp data/raw/*event*.log data/processed/event_logs/
-cp data/raw/*user*.log data/processed/user_logs/
-
-# ###7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs
-rf -rf ./data
-
-rm -f data/raw/*ipaddr*
-rm -f data/processed/user_logs/*ipaddr*
-
+cp raw/*user*.log processed/user_logs/
+cp raw/*event*.log processed/event_logs/
+# 7. For user privacy, remove all files containing IP addresses (files with "ipaddr" in the filename) from ./data/raw and ./data/processed/user_logs
+rm -f raw/*ipaddr*
+rm -f processed/user_logs/*ipaddr*
+# I resovled merge conflict
 # 8. Create a file named ./data/inventory.txt that lists all the files in the subfolders of ./data/processed
-
-find data/processed -type f > data/inventory.txt
+find processed -type f > inventory.txt
+cd ..
 
 ###########################################
-
-echo "Project setup is complete done by Anthony Chudee!"
\ No newline at end of file
+# to run this script: cd to the directory containing assignment.sh and run: bash assignment.sh
+echo "Project setup is complete!"