modified .gigigmore
merge