resolved conflicts
merged further