Design 1
Fix merge conflicts