fixing lots of conflictsand little things