Fix from merge conflict