repair code conflict -front-layou file-