inital local commit
fixed conflicts