More stuff from merge conflict