Original merge do GitHub 2