Some Problems with code conflict fixed