fixed merge issues in manifest