Thanks @KayceeSamuel for the quick turn around for this. Can you please add a short description of what was achieved in this task in the PR message above? Also, there's a conflict that needs to be resolved. Remember also to rebase your commit after resolving the conflict.
# step 1: pull dev into your local branch
git pull origin dev
# step 2: resolve the conflict
# step 3: rebase like so:
git rebase -i --autosquash origin/dev
Thanks @KayceeSamuel for the quick turn around for this. Can you please add a short description of what was achieved in this task in the PR message above? Also, there's a conflict that needs to be resolved. Remember also to rebase your commit after resolving the conflict.