finally fixed conflicts
finally fixed conflicts

nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound,nikhilsinghmus/csound