First commit
Fixing merge issues