merged
fixed merge bug