shader inc post merge fix