still trying to figure out the merge problem