fixed minor merge bug