PSA: Learn how to merge

This includes everyone..