stat resolved conflict

stat resolved conflict