This is great and all, but the merge process is still messy as hell