checkout master aftr switch
resolve merge conflict