Ahhh more auto-merge stuff