merging stuff
merged conflicts
fixed text fields