Remove erroneously committed merge backup
Merge branch 'develop'