solve merging mistake