many mistakes were made!
fix merging problems