getting ready
Fix conflicts