Fixing merge isssues