* Resolve conflicts & extend pull request by sg3s