syncing up with Armin before heading out
merging