viviac3's new pull request

did i solve the conflict??