Better and fixed merge