edited the same line 10
added auto merged file