solved buggy merging