Fixing merge more