more git management
merging