fixed path issue
fixed conflicts in sh files