fixed git durp merge/push/pull stuff derped