added my line to the file
completing merge