added carmack tweet
fixed conflicts