Minor Bug Fix (also fixed git merge conflicts)