added more to master file
resolved merge conflict
added final line. done for v2.