Resolved conflicted merge. +1 beer