amending last commit with manual merge