Fix conflicts in last commit