@jetcube Yesterday I spent the entire day merging code also. It's fun! I love branches! #sarcasm