resolved conflicts

issues with design fixed