resolved conflicts
rebuild buget