resolving the problem, renaming 1d to 1D
resolving merge issue and renaming 1d to 1D everywhere