Fixing mashed merge