merge problem hope to be solved