Added a change within the branc.
Mad another change in brach.
Made a change in Master branch.
Fixed merge conflict.