banging head against wall
merge stuff
marging files
modified notes file