Fixing commits
Fixing merge issues