fixed merge problem