Delete removeme.txt file
Resolve conflict with removeme.txt file
Merge branch 'master' into develop
Delete removeme.txt file
Merge branch 'develop'