Removing some merge trash.