still trying to get merging right...