hopefully fixed merge problem