Russell Heimlich @kingkool68 • February 23, 2016 10:29 pm Git merge conflict https://tweets.kingkool68.com/wp-content/uploads/sites/4/2016/02/Cb7svqKWIAA6Q65.mp4