Updating license header on source code
Fix merge conflict