addition test
..
merge git preferences