Merge request, fix