Missed some conflicts in last commit