Fixing merge little mess