merge from circleci with push and fetch