TestMerge added
master bug fix
resolve merge conflict