i have to do the commits first
merge conflicts