BUG: Importing from wrong file
May be merging two identical files here.
Merge branch 'develop'