Changes not pulled correctly
Need to pull from origin
Merged github with laptop and fixed changes