second line added in
merging issues resolved