initial build
merged and resolved conflicts