layer merge fixed