revert to 97601bc2d8ab6f404efcb2a3f64858f2e55346fd
removed excess end
resolve conflict