merging 5 commmits for today was having issues with git