Edited the file, merged from the newbranch branch