Fixed conflict for real, last commit was wrong