Fixed merge conflict from master. Made formatting consistent.