Tracker

the osx github tool doesn't seem to be handling the merge stuff correctly ... try merging things via the web interface.