# created new merge file
# added a second line for this file
# added a third line for this file
# added a fourth line for this file
# added a fifth line for this file
# added a sixth line for this file
# changed to new mergeFile branch