commiting all changes thus far
conflict solved hopefully