Fixing a merge issue in android project file.