Fixing merge mess