Fixes remaining conflict