Fixing merge bug.