Changed in both cloud master and local tempBranch
Added resolved file