apparently I dont know how to git add
should merge? maybe?