Removing stub index due to merge conflicts