Finalized branch merging, sorry about that