resolve merge
resolve merge2
added new file