Trying to commit ALL my files this time.
hopefully this will work
updating merged files