fixed conflicts (LOL merge -s ours; push -f) (courtesy of http://whatthecommit.com/)