Should fix the issues with merging.