build and validatiins
merged conflicts