Add my parts
fixed merge results
Fix merge commits