hamals edits to the file
the auto merge error