fixed wsa merge bug.