Actually fixed all merging conflicts this time