My feature

I think I got it and just want to make sure what I am doing is right after resolving the conflicts.