Deleted duplicate header
Merge branch 'develop'