Fix merge terribleness