fixed weird merge head thing