inactive splash page put up
merge conflicts on an ignore file. wtf