Added standard newline to end of file.
resolved conflict