Hopefully fixed all conflicts now.