little stuff
merge problems